(vc-svn-after-dir-status): Fix regexp to allow for

file names with leading spaces.  Ignore "." if it appears as a
filename.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2d469b9a462ed20052abebc4414e859d8fbfbdf9..72550a2e7640b4582a60e31e090c431a531a835d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2009-04-15  Dan Nicolaescu  <dann@ics.uci.edu>
+
+       * vc-svn.el (vc-svn-after-dir-status): Fix regexp to allow for
+       file names with leading spaces.  Ignore "." if it appears as a
+       filename.
+
 2009-04-14  Juanma Barranquero  <lekktu@gmail.com>
 
        * help-at-pt.el (help-at-pt-kbd-string): Reflow docstring.

diff --git a/lisp/vc-svn.el b/lisp/vc-svn.el
index a2e455a8702a26b1119f482c502aa909bfaa5fce..6eeb8985bfd125c094ad34a82baa9d5b19a511fe 100644 (file)
--- a/lisp/vc-svn.el
+++ b/lisp/vc-svn.el
@@ -164,7 +164,7 @@ want to force an empty list of arguments, use t."
                      (?? . unregistered)
                      ;; This is what vc-svn-parse-status does.
                      (?~ . edited)))
-       (re (if remote "^\\(.\\)..... \\([ *]\\) +\\(?:[-0-9]+\\)? +\\(.*\\)$"
+       (re (if remote "^\\(.\\)..... \\([ *]\\) +\\(?:[-0-9]+\\)?   \\(.*\\)$"
              ;; Subexp 2 is a dummy in this case, so the numbers match.
              "^\\(.\\)....\\(.\\) \\(.*\\)$"))
        result)
@@ -176,7 +176,7 @@ want to force an empty list of arguments, use t."
             ;; FIXME are there other possible combinations?
             (cond ((eq state 'edited) (setq state 'needs-merge))
                   ((not state) (setq state 'needs-update))))
-       (when state
+       (when (and state (not (string= "." filename)))
          (setq result (cons (list filename state) result)))))
     (funcall callback result)))